Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Sun, 31 Mar 2013 12:36:07 +0000 (15:36 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sun, 31 Mar 2013 12:36:07 +0000 (15:36 +0300)
commit33c18caa7bd561164019fae75125e19ef45a7187
tree0532cd8cfd51336e7326bd951e4d03a413c112eb
parent50c4f47522f1e03ca8ef2a07d908114e63e13498
parent54167e70b69c103274a12e8866f8e28f0f72ae52
Merge from trunk.